From 2a10ed3ec762aa8c8da0628f43e24c467df5882d Mon Sep 17 00:00:00 2001
From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 2 Mar 2001 12:56:48 +0000
Subject: [PATCH] (Fcurrent_time_zone) [HAVE_TM_ZONE || HAVE_TZNAME]: Accept
 only alphanumeric time zone names.

---
 src/editfns.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/editfns.c b/src/editfns.c
index 2f5e3f711ea..d8f03114b4e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1757,6 +1757,20 @@ the data it can't find.")
 	s = tzname[t->tm_isdst];
 #endif
 #endif /* not HAVE_TM_ZONE */
+
+#if defined HAVE_TM_ZONE || defined HAVE_TZNAME
+      if (s)
+	{
+	  /* On Japanese w32, we can get a Japanese string as time
+	     zone name.  Don't accept that.  */
+	  char *p;
+	  for (p = s; *p && isalnum (*p); ++p)
+	    ;
+	  if (p == s || *p)
+	    s = NULL;
+	}
+#endif
+
       if (!s)
 	{
 	  /* No local time zone name is available; use "+-NNNN" instead.  */
-- 
2.30.2